From 44b9c2d13fd32188fae653184403bc00cb118c3b Mon Sep 17 00:00:00 2001 From: James Henstridge Date: Wed, 12 Dec 2001 12:21:52 +0000 Subject: [PATCH] check GTK_MENU_ITEM (menu_item)->accel_path first when looking up the 2001-12-12 James Henstridge * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM (menu_item)->accel_path first when looking up the accel path. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkmenu.c | 4 +++- 8 files changed, 38 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c353dd1ba2..6232eafcaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-12-12 James Henstridge + + * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM + (menu_item)->accel_path first when looking up the accel path. + Tue Dec 11 19:18:21 2001 Owen Taylor * tests/testgtk.c (layout_expose_handler): Only draw diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c353dd1ba2..6232eafcaf 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-12-12 James Henstridge + + * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM + (menu_item)->accel_path first when looking up the accel path. + Tue Dec 11 19:18:21 2001 Owen Taylor * tests/testgtk.c (layout_expose_handler): Only draw diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c353dd1ba2..6232eafcaf 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-12-12 James Henstridge + + * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM + (menu_item)->accel_path first when looking up the accel path. + Tue Dec 11 19:18:21 2001 Owen Taylor * tests/testgtk.c (layout_expose_handler): Only draw diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c353dd1ba2..6232eafcaf 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-12-12 James Henstridge + + * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM + (menu_item)->accel_path first when looking up the accel path. + Tue Dec 11 19:18:21 2001 Owen Taylor * tests/testgtk.c (layout_expose_handler): Only draw diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c353dd1ba2..6232eafcaf 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-12-12 James Henstridge + + * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM + (menu_item)->accel_path first when looking up the accel path. + Tue Dec 11 19:18:21 2001 Owen Taylor * tests/testgtk.c (layout_expose_handler): Only draw diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c353dd1ba2..6232eafcaf 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-12-12 James Henstridge + + * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM + (menu_item)->accel_path first when looking up the accel path. + Tue Dec 11 19:18:21 2001 Owen Taylor * tests/testgtk.c (layout_expose_handler): Only draw diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c353dd1ba2..6232eafcaf 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-12-12 James Henstridge + + * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM + (menu_item)->accel_path first when looking up the accel path. + Tue Dec 11 19:18:21 2001 Owen Taylor * tests/testgtk.c (layout_expose_handler): Only draw diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 940433f4b5..e3940b511a 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -1659,7 +1659,9 @@ gtk_menu_key_press (GtkWidget *widget, gboolean replace_accels = TRUE; const gchar *path; - path = _gtk_widget_get_accel_path (menu_item); + path = GTK_MENU_ITEM (menu_item)->accel_path; + if (!path) + path = _gtk_widget_get_accel_path (menu_item); if (!path) { /* can't change accelerators on menu_items without paths -- 2.30.2